From 0423f909039c2b1e234c1839f0518a073edbced4 Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 28 Feb 2006 17:27:50 +0000 Subject: [PATCH] A brainless search and replace to placate compilers that complain about well defined code that relies on the ISO C guarantee of unstated structure initializers. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@1753 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/Makefile | 2 +- gpsbabel/an1.c | 18 ++-- gpsbabel/arcdist.c | 10 +-- gpsbabel/bcr.c | 6 +- gpsbabel/brauniger_iq.c | 2 +- gpsbabel/cetus.c | 7 +- gpsbabel/compegps.c | 4 +- gpsbabel/coto.c | 8 +- gpsbabel/cst.c | 2 +- gpsbabel/csv_util.c | 4 +- gpsbabel/cvttypes.c | 4 +- gpsbabel/defs.h | 3 + gpsbabel/delgpl.c | 4 +- gpsbabel/discard.c | 8 +- gpsbabel/duplicate.c | 10 +-- gpsbabel/easygps.c | 2 +- gpsbabel/filter_skeleton.c | 4 +- gpsbabel/format_skeleton.c | 4 +- gpsbabel/garmin.c | 10 +-- gpsbabel/gdb.c | 4 +- gpsbabel/geo.c | 6 +- gpsbabel/geoniche.c | 10 ++- gpsbabel/glogbook.c | 2 +- gpsbabel/gpilots.c | 4 +- gpsbabel/gpspilot.c | 4 +- gpsbabel/gpx.c | 172 ++++++++++++++++++------------------ gpsbabel/gtm.c | 2 +- gpsbabel/hiketech.c | 2 +- gpsbabel/hsa_ndv.c | 2 +- gpsbabel/html.c | 8 +- gpsbabel/igc.c | 4 +- gpsbabel/ignrando.c | 2 +- gpsbabel/jeeps/gpsusbsend.c | 3 +- gpsbabel/kml.c | 14 +-- gpsbabel/lowranceusr.c | 10 +-- gpsbabel/mag_pdb.c | 2 +- gpsbabel/magproto.c | 24 ++--- gpsbabel/mapsource.c | 12 +-- gpsbabel/msroute.c | 2 +- gpsbabel/navicache.c | 4 +- gpsbabel/netstumbler.c | 17 ++-- gpsbabel/nmea.c | 12 +-- gpsbabel/nmn4.c | 2 +- gpsbabel/nukedata.c | 8 +- gpsbabel/overlay.c | 12 +-- gpsbabel/ozi.c | 12 +-- gpsbabel/palmdoc.c | 12 +-- gpsbabel/pathaway.c | 6 +- gpsbabel/pcx.c | 6 +- gpsbabel/polygon.c | 6 +- gpsbabel/position.c | 18 ++-- gpsbabel/psitrex.c | 2 +- gpsbabel/quovadis.c | 4 +- gpsbabel/reverse_route.c | 2 +- gpsbabel/saroute.c | 10 +-- gpsbabel/shape.c | 2 +- gpsbabel/smplrout.c | 6 +- gpsbabel/sort.c | 10 +-- gpsbabel/stackfilter.c | 18 ++-- gpsbabel/stmwpp.c | 2 +- gpsbabel/tef_xml.c | 4 +- gpsbabel/text.c | 8 +- gpsbabel/tiger.c | 26 +++--- gpsbabel/tomtom.c | 2 +- gpsbabel/tpg.c | 4 +- gpsbabel/tpo.c | 6 +- gpsbabel/trackfilter.c | 16 ++-- gpsbabel/unicsv.c | 2 +- gpsbabel/vcf.c | 4 +- gpsbabel/vitosmt.c | 5 +- gpsbabel/xcsv.c | 14 +-- gpsbabel/yahoo.c | 4 +- 72 files changed, 344 insertions(+), 323 deletions(-) diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile index 8c4a865e9..e06353493 100644 --- a/gpsbabel/Makefile +++ b/gpsbabel/Makefile @@ -30,7 +30,7 @@ OUTPUT_SWITCH=-o # # # Enable either or both of these as you wish. # -OPTIMIZATION=-O $(EXTRA_OPTIMIZATION) +OPTIMIZATION=-O -W $(EXTRA_OPTIMIZATION) DEBUGGING=-g $(EXTRA_DEBUGGING) # add -DDEBUG_MEM to turn on memory allocation logging CFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -Icoldsync $(INHIBIT_EXPAT) $(INHIBIT_USB) $(OPTIMIZATION) diff --git a/gpsbabel/an1.c b/gpsbabel/an1.c index 79613fcf4..17d3418c0 100644 --- a/gpsbabel/an1.c +++ b/gpsbabel/an1.c @@ -58,23 +58,23 @@ roadchange *roadchanges = NULL; static arglist_t an1_args[] = { {"type", &output_type, "Type of .an1 file (see README)", - "", ARGTYPE_STRING }, + "", ARGTYPE_STRING, ARG_NOMINMAX }, {"road", &road_changes, "Road type changes (see README)", - "", ARGTYPE_HIDDEN | ARGTYPE_STRING }, + "", ARGTYPE_HIDDEN | ARGTYPE_STRING, ARG_NOMINMAX }, {"nogc", &nogc, "Do not add geocache data to description", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"deficon", &opt_symbol, "Symbol to use for point data", - "Red Flag", ARGTYPE_STRING }, + "Red Flag", ARGTYPE_STRING, ARG_NOMINMAX }, {"color", &opt_color, "Color for lines or mapnotes", - "red", ARGTYPE_STRING }, + "red", ARGTYPE_STRING, ARG_NOMINMAX }, {"zoom", &opt_zoom, "Zoom level to reduce points", - NULL, ARGTYPE_INT }, + NULL, ARGTYPE_INT, ARG_NOMINMAX }, {"wpt_type", &opt_wpt_type, "Waypoint type (marker,text,mapnote,circle)", - "", ARGTYPE_STRING }, + "", ARGTYPE_STRING, ARG_NOMINMAX }, {"radius", &opt_radius, "Radius for circles", - NULL, ARGTYPE_STRING }, - {0, 0, 0, 0 } + NULL, ARGTYPE_STRING, ARG_NOMINMAX }, + ARG_TERMINATOR }; typedef struct guid { diff --git a/gpsbabel/arcdist.c b/gpsbabel/arcdist.c index be5d1576b..d6b322a64 100644 --- a/gpsbabel/arcdist.c +++ b/gpsbabel/arcdist.c @@ -37,14 +37,14 @@ typedef struct { static arglist_t arcdist_args[] = { {"file", &arcfileopt, "File containing vertices of arc", - NULL, ARGTYPE_FILE | ARGTYPE_REQUIRED}, + NULL, ARGTYPE_FILE | ARGTYPE_REQUIRED, ARG_NOMINMAX}, {"distance", &distopt, "Maximum distance from arc", - NULL, ARGTYPE_FLOAT | ARGTYPE_REQUIRED}, + NULL, ARGTYPE_FLOAT | ARGTYPE_REQUIRED, ARG_NOMINMAX}, {"exclude", &exclopt, "Exclude points close to the arc", NULL, - ARGTYPE_BOOL}, + ARGTYPE_BOOL, ARG_NOMINMAX}, {"points", &ptsopt, "Use distance from vertices not lines", - NULL, ARGTYPE_BOOL}, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, + ARG_TERMINATOR }; #define BADVAL 999999 diff --git a/gpsbabel/bcr.c b/gpsbabel/bcr.c index 7fa438486..3216f88f1 100644 --- a/gpsbabel/bcr.c +++ b/gpsbabel/bcr.c @@ -58,9 +58,9 @@ static char *radius_opt; static arglist_t bcr_args[] = { {"index", &rtenum_opt, "Index of route to write (if more the one in source)", NULL, ARGTYPE_INT, "1", NULL }, - {"name", &rtename_opt, "New name for the route", NULL, ARGTYPE_STRING }, - {"radius", &radius_opt, "Radius of our big earth (default 6371000 meters)", "6371000", ARGTYPE_FLOAT }, - {0, 0, 0, 0, 0} + {"name", &rtename_opt, "New name for the route", NULL, ARGTYPE_STRING, ARG_NOMINMAX }, + {"radius", &radius_opt, "Radius of our big earth (default 6371000 meters)", "6371000", ARGTYPE_FLOAT, ARG_NOMINMAX }, + ARG_TERMINATOR }; static void diff --git a/gpsbabel/brauniger_iq.c b/gpsbabel/brauniger_iq.c index 42647bff7..eed8cc932 100644 --- a/gpsbabel/brauniger_iq.c +++ b/gpsbabel/brauniger_iq.c @@ -263,7 +263,7 @@ static void data_read(void) } static arglist_t brauniger_iq_args[] = { - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; ff_vecs_t brauniger_iq_vecs = { diff --git a/gpsbabel/cetus.c b/gpsbabel/cetus.c index ca1bc49f8..4f59cd16b 100644 --- a/gpsbabel/cetus.c +++ b/gpsbabel/cetus.c @@ -148,10 +148,11 @@ static char *appendicon = NULL; static arglist_t cetus_args[] = { - {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING }, + {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING, + ARG_NOMINMAX }, {"appendicon", &appendicon, "Append icon_descr to description", - NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0 } + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; static waypoint * diff --git a/gpsbabel/compegps.c b/gpsbabel/compegps.c index ed0cf7c57..64df78cc6 100644 --- a/gpsbabel/compegps.c +++ b/gpsbabel/compegps.c @@ -89,14 +89,14 @@ static char *option_snlen; static arglist_t compegps_args[] = { {"deficon", &option_icon, "Default icon name", - NULL, ARGTYPE_STRING}, + NULL, ARGTYPE_STRING, ARG_NOMINMAX }, {"index", &option_index, "Index of route/track to write (if more the one in source)", NULL, ARGTYPE_INT, "1", NULL}, {"radius", &option_radius, "Give points (waypoints/route points) a default radius (proximity)", NULL, ARGTYPE_FLOAT, "0", NULL}, {"snlen", &option_snlen, "Length of generated shortnames (default 16)", "16", ARGTYPE_INT, "1", NULL}, - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; /* specialized readers */ diff --git a/gpsbabel/coto.c b/gpsbabel/coto.c index 76ac95b47..be07e701d 100644 --- a/gpsbabel/coto.c +++ b/gpsbabel/coto.c @@ -102,9 +102,11 @@ static char *internals = NULL; static arglist_t coto_args[] = { - {"zerocat", &zerocat, "Name of the 'unassigned' category", NULL, ARGTYPE_STRING }, - {"internals", &internals, "Export some internal stuff to notes", NULL, ARGTYPE_STRING | ARGTYPE_HIDDEN }, - {0, 0, 0, 0, 0 } + {"zerocat", &zerocat, "Name of the 'unassigned' category", NULL, + ARGTYPE_STRING, ARG_NOMINMAX }, + {"internals", &internals, "Export some internal stuff to notes", NULL, + ARGTYPE_STRING | ARGTYPE_HIDDEN, ARG_NOMINMAX }, + ARG_TERMINATOR }; static void diff --git a/gpsbabel/cst.c b/gpsbabel/cst.c index 5026a3bca..9c815e92d 100644 --- a/gpsbabel/cst.c +++ b/gpsbabel/cst.c @@ -47,7 +47,7 @@ static route_head *temp_route; static arglist_t cst_args[] = { - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; /* helpers */ diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c index 877851ad1..8e56442a1 100644 --- a/gpsbabel/csv_util.c +++ b/gpsbabel/csv_util.c @@ -648,7 +648,9 @@ static time_t sscanftime( const char *s, const char *format, const int gmt ) { - struct tm stm = {0,0,0,0,0,0,0,0,0}; + struct tm stm; + memset(&stm, 0, sizeof(stm)); + if ( strptime( s, format, &stm ) ) { stm.tm_isdst = -1; diff --git a/gpsbabel/cvttypes.c b/gpsbabel/cvttypes.c index a61cec634..c39780b6f 100644 --- a/gpsbabel/cvttypes.c +++ b/gpsbabel/cvttypes.c @@ -32,8 +32,8 @@ time_t tmstart; static arglist_t cvttype_skeleton_args[] = { {"action", &action, "Type of conversion to perform", "wpttotrk", - ARGTYPE_STRING} , - {0, 0, 0, 0, 0} + ARGTYPE_STRING, ARG_NOMINMAX} , + ARG_TERMINATOR }; diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index 0cce2d982..9db7ba3e1 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -478,6 +478,9 @@ void vmem_realloc(vmem_t*, size_t); #define ARGTYPE_TYPEMASK 0x00000fff #define ARGTYPE_FLAGMASK 0xfffff000 +#define ARG_NOMINMAX NULL, NULL +#define ARG_TERMINATOR {0, 0, 0, 0, 0, ARG_NOMINMAX} + typedef struct arglist { char *argstring; char **argval; diff --git a/gpsbabel/delgpl.c b/gpsbabel/delgpl.c index 24d90b5c8..66097eb60 100644 --- a/gpsbabel/delgpl.c +++ b/gpsbabel/delgpl.c @@ -97,7 +97,9 @@ gpl_trackpt(const waypoint *wpt) { double alt_feet = wpt->altitude / .3048; int status = 3; - gpl_point_t gp = {0}; + gpl_point_t gp; + + memset(&gp, 0, sizeof(gp)); le_write32(&gp.status, status); le_read64(&gp.lat, &wpt->latitude); le_read64(&gp.lon, &wpt->longitude); diff --git a/gpsbabel/discard.c b/gpsbabel/discard.c index 0973313ba..045c12112 100644 --- a/gpsbabel/discard.c +++ b/gpsbabel/discard.c @@ -31,12 +31,12 @@ static double vdopf; static arglist_t fix_args[] = { {"hdop", &hdopopt, "Suppress waypoints with higher hdop", - "-1.0", ARGTYPE_BEGIN_REQ | ARGTYPE_FLOAT}, + "-1.0", ARGTYPE_BEGIN_REQ | ARGTYPE_FLOAT, ARG_NOMINMAX}, {"vdop", &vdopopt, "Suppress waypoints with higher vdop", - "-1.0", ARGTYPE_END_REQ | ARGTYPE_FLOAT}, + "-1.0", ARGTYPE_END_REQ | ARGTYPE_FLOAT, ARG_NOMINMAX}, {"hdopandvdop", &andopt, "Link hdop and vdop supression with AND", - NULL, ARGTYPE_BOOL}, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, + ARG_TERMINATOR }; /* diff --git a/gpsbabel/duplicate.c b/gpsbabel/duplicate.c index 31372ec6e..bc5da9107 100644 --- a/gpsbabel/duplicate.c +++ b/gpsbabel/duplicate.c @@ -30,14 +30,14 @@ static char *correct_coords = NULL; static arglist_t dup_args[] = { {"shortname", &snopt, "Suppress duplicate waypoints based on name", - NULL, ARGTYPE_BEGIN_REQ | ARGTYPE_BOOL}, + NULL, ARGTYPE_BEGIN_REQ | ARGTYPE_BOOL, ARG_NOMINMAX}, {"location", &lcopt, "Suppress duplicate waypoint based on coords", - NULL, ARGTYPE_END_REQ | ARGTYPE_BOOL}, + NULL, ARGTYPE_END_REQ | ARGTYPE_BOOL, ARG_NOMINMAX}, {"all", &purge_duplicates, "Suppress all instances of duplicates", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {"correct", &correct_coords, "Use coords from duplicate points", - NULL, ARGTYPE_BOOL}, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, + ARG_TERMINATOR }; diff --git a/gpsbabel/easygps.c b/gpsbabel/easygps.c index 8945210c0..facfaf7c1 100644 --- a/gpsbabel/easygps.c +++ b/gpsbabel/easygps.c @@ -33,7 +33,7 @@ static arglist_t easygps_args[] = { /* {"deficon", &deficon, "Default icon name", "Waypoint", ARGTYPE_STRING}, */ - {0, 0, 0, 0 } + ARG_TERMINATOR }; static void diff --git a/gpsbabel/filter_skeleton.c b/gpsbabel/filter_skeleton.c index ac4f0d836..14bb2b02c 100644 --- a/gpsbabel/filter_skeleton.c +++ b/gpsbabel/filter_skeleton.c @@ -38,8 +38,8 @@ static arglist_t filter_skeleton_args[] = { // {"foo", &fooopt, "The text of the foo option in help", -// "default", ARGYTPE_STRING} , - {0, 0, 0, 0, 0} +// "default", ARGYTPE_STRING, ARG_NOMINMAX} , + ARG_TERMINATOR }; /******************************************************************************* diff --git a/gpsbabel/format_skeleton.c b/gpsbabel/format_skeleton.c index 584a30eee..64485cb19 100644 --- a/gpsbabel/format_skeleton.c +++ b/gpsbabel/format_skeleton.c @@ -49,8 +49,8 @@ static arglist_t format_skeleton_args[] = { // {"foo", &fooopt, "The text of the foo option in help", -// "default", ARGYTPE_STRING} , - {0, 0, 0, 0, 0} +// "default", ARGYTPE_STRING, ARG_NOMINMAX} , + ARG_TERMINATOR }; /******************************************************************************* diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c index a0c4be9d9..ad5cb80c6 100644 --- a/gpsbabel/garmin.c +++ b/gpsbabel/garmin.c @@ -45,13 +45,13 @@ arglist_t garmin_args[] = { { "snlen", &snlen, "Length of generated shortnames", NULL, ARGTYPE_INT, "1", NULL }, { "snwhite", &snwhiteopt, "Allow whitespace synth. shortnames", - NULL, ARGTYPE_BOOL}, - { "deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, + { "deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING, ARG_NOMINMAX }, { "get_posn", &getposn, "Return current position as a waypoint", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, { "power_off", &poweroff, "Command unit to power itself down", - NULL, ARGTYPE_BOOL}, - { 0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, + ARG_TERMINATOR }; static const char * d103_symbol_from_icon_number(unsigned int n); diff --git a/gpsbabel/gdb.c b/gpsbabel/gdb.c index ccc45d04c..3f98f1340 100644 --- a/gpsbabel/gdb.c +++ b/gpsbabel/gdb.c @@ -116,8 +116,8 @@ static arglist_t gdb_args[] = { {GDB_OPT_VER, &gdb_opt_ver, "Version of gdb file to generate (1,2)", "2", ARGTYPE_INT, "1", "2"}, {GDB_OPT_VIA, &gdb_opt_via, - "Drop route points that do not have an equivalent waypoint (hidden points)", NULL, ARGTYPE_BOOL}, - {0, 0, 0, 0, 0} + "Drop route points that do not have an equivalent waypoint (hidden points)", NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, + ARG_TERMINATOR }; /********************************************************************************************************/ diff --git a/gpsbabel/geo.c b/gpsbabel/geo.c index 5dadf4000..a92c71547 100644 --- a/gpsbabel/geo.c +++ b/gpsbabel/geo.c @@ -29,9 +29,9 @@ static FILE *ofd; static arglist_t geo_args[] = { - {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING }, - {"nuke_placer", &nuke_placer, "Omit Placer name", NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING, ARG_NOMINMAX }, + {"nuke_placer", &nuke_placer, "Omit Placer name", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; #define MYNAME "geo" diff --git a/gpsbabel/geoniche.c b/gpsbabel/geoniche.c index d415b0665..621221c80 100644 --- a/gpsbabel/geoniche.c +++ b/gpsbabel/geoniche.c @@ -48,10 +48,10 @@ static char *Arg_category = NULL; static arglist_t Args[] = { {"dbname", &Arg_dbname, - "Database name (filename)", NULL, ARGTYPE_STRING }, + "Database name (filename)", NULL, ARGTYPE_STRING, ARG_NOMINMAX }, {"category", &Arg_category, - "Category name (Cache)", NULL, ARGTYPE_STRING }, - {0, 0, 0, 0, 0 } + "Category name (Cache)", NULL, ARGTYPE_STRING, ARG_NOMINMAX }, + ARG_TERMINATOR }; #define ARG_FREE(X) do { if (X) { xfree(X); X = NULL; } } while (0) @@ -215,7 +215,9 @@ geoniche_read_asc(const struct pdb *pdb) int icon; char *notes; char gid[6+1]; - struct tm tm = {0}; + struct tm tm; + + memset(&tm, 0, sizeof(tm)); wpt = waypt_new(); if (!wpt) diff --git a/gpsbabel/glogbook.c b/gpsbabel/glogbook.c index 3711bcd76..2212c8bc4 100644 --- a/gpsbabel/glogbook.c +++ b/gpsbabel/glogbook.c @@ -31,7 +31,7 @@ static route_head *trk_head; static arglist_t glogbook_args[] = { - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; /* Tracks */ diff --git a/gpsbabel/gpilots.c b/gpsbabel/gpilots.c index 4b1abe6d2..e4ee0e2a0 100644 --- a/gpsbabel/gpilots.c +++ b/gpsbabel/gpilots.c @@ -160,8 +160,8 @@ static char *dbname = NULL; static arglist_t my_args[] = { - {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING}, - {0, 0, 0, 0, 0} + {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING, ARG_NOMINMAX}, + ARG_TERMINATOR }; static void diff --git a/gpsbabel/gpspilot.c b/gpsbabel/gpspilot.c index 0ab9f1a5d..8a5de41a1 100644 --- a/gpsbabel/gpspilot.c +++ b/gpsbabel/gpspilot.c @@ -54,8 +54,8 @@ static char *dbname = NULL; static arglist_t gpspilot_args[] = { - {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING}, - {0, 0, 0, 0, 0} + {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING, ARG_NOMINMAX}, + ARG_TERMINATOR }; static void diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c index 887705dce..b1104bfca 100644 --- a/gpsbabel/gpx.c +++ b/gpsbabel/gpx.c @@ -245,89 +245,89 @@ typedef struct tag_mapping { */ tag_mapping tag_path_map[] = { - { tt_gpx, 0, "/gpx" }, - { tt_name, 0, "/gpx/name" }, - { tt_desc, 0, "/gpx/desc" }, - { tt_author, 0, "/gpx/author" }, - { tt_email, 0, "/gpx/email" }, - { tt_url, 0, "/gpx/url" }, - { tt_urlname, 0, "/gpx/urlname" }, - { tt_keywords, 0, "/gpx/keywords" }, - - { tt_wpt, 0, "/gpx/wpt" }, - { tt_wpt_ele, 0, "/gpx/wpt/ele" }, - { tt_wpt_time, 0, "/gpx/wpt/time" }, - { tt_wpt_name, 0, "/gpx/wpt/name" }, - { tt_wpt_cmt, 0, "/gpx/wpt/cmt" }, - { tt_wpt_desc, 0, "/gpx/wpt/desc" }, - { tt_wpt_url, 0, "/gpx/wpt/url" }, - { tt_wpt_urlname, 0, "/gpx/wpt/urlname" }, - { tt_wpt_link, 0, "/gpx/wpt/link" }, /* GPX 1.1 */ - { tt_wpt_link_text, 0, "/gpx/wpt/link/text" }, /* GPX 1.1 */ - { tt_wpt_sym, 0, "/gpx/wpt/sym" }, - { tt_wpt_type, 1, "/gpx/wpt/type" }, - { tt_cache, 1, "/gpx/wpt/groundspeak:cache" }, - { tt_cache_name, 1, "/gpx/wpt/groundspeak:cache/groundspeak:name" }, - { tt_cache_container, 1, "/gpx/wpt/groundspeak:cache/groundspeak:container" }, - { tt_cache_type, 1, "/gpx/wpt/groundspeak:cache/groundspeak:type" }, - { tt_cache_difficulty, 1, "/gpx/wpt/groundspeak:cache/groundspeak:difficulty" }, - { tt_cache_terrain, 1, "/gpx/wpt/groundspeak:cache/groundspeak:terrain" }, - { tt_cache_hint, 1, "/gpx/wpt/groundspeak:cache/groundspeak:encoded_hints" }, - { tt_cache_desc_short, 1, "/gpx/wpt/groundspeak:cache/groundspeak:short_description" }, - { tt_cache_desc_long, 1, "/gpx/wpt/groundspeak:cache/groundspeak:long_description" }, - { tt_cache_log_wpt, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:log_wpt" }, - { tt_cache_log_type, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:type" }, - { tt_cache_log_date, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:date" }, - { tt_cache_placer, 1, "/gpx/wpt/groundspeak:cache/groundspeak:owner" }, - - { tt_rte, 0, "/gpx/rte" }, - { tt_rte_name, 0, "/gpx/rte/name" }, - { tt_rte_desc, 0, "/gpx/rte/desc" }, - { tt_rte_number, 0, "/gpx/rte/number" }, - { tt_rte_rtept, 0, "/gpx/rte/rtept" }, - { tt_rte_rtept_ele, 0, "/gpx/rte/rtept/ele" }, - { tt_rte_rtept_time, 0, "/gpx/rte/rtept/time" }, - { tt_rte_rtept_name, 0, "/gpx/rte/rtept/name" }, - { tt_rte_rtept_cmt, 0, "/gpx/rte/rtept/cmt" }, - { tt_rte_rtept_desc, 0, "/gpx/rte/rtept/desc" }, - { tt_rte_rtept_url, 0, "/gpx/rte/rtept/url" }, - { tt_rte_rtept_urlname, 0, "/gpx/rte/rtept/urlname" }, - { tt_rte_rtept_sym, 0, "/gpx/rte/rtept/sym" }, - - { tt_trk, 0, "/gpx/trk" }, - { tt_trk_name, 0, "/gpx/trk/name" }, - { tt_trk_desc, 0, "/gpx/trk/desc" }, - { tt_trk_trkseg, 0, "/gpx/trk/trkseg" }, - { tt_trk_number, 0, "/gpx/trk/number" }, - { tt_trk_trkseg_trkpt, 0, "/gpx/trk/trkseg/trkpt" }, - { tt_trk_trkseg_trkpt_ele, 0, "/gpx/trk/trkseg/trkpt/ele" }, - { tt_trk_trkseg_trkpt_time, 0, "/gpx/trk/trkseg/trkpt/time" }, - { tt_trk_trkseg_trkpt_name, 0, "/gpx/trk/trkseg/trkpt/name" }, - { tt_trk_trkseg_trkpt_cmt, 0, "/gpx/trk/trkseg/trkpt/cmt" }, - { tt_trk_trkseg_trkpt_desc, 0, "/gpx/trk/trkseg/trkpt/desc" }, - { tt_trk_trkseg_trkpt_url, 0, "/gpx/trk/trkseg/trkpt/url" }, - { tt_trk_trkseg_trkpt_urlname, 0, "/gpx/trk/trkseg/trkpt/urlname" }, - { tt_trk_trkseg_trkpt_sym, 0, "/gpx/trk/trkseg/trkpt/sym" }, - { tt_trk_trkseg_trkpt_course, 0, "/gpx/trk/trkseg/trkpt/course" }, - { tt_trk_trkseg_trkpt_speed, 0, "/gpx/trk/trkseg/trkpt/speed" }, + { tt_gpx, 0, "/gpx", 0UL }, + { tt_name, 0, "/gpx/name", 0UL }, + { tt_desc, 0, "/gpx/desc", 0UL }, + { tt_author, 0, "/gpx/author", 0UL }, + { tt_email, 0, "/gpx/email", 0UL }, + { tt_url, 0, "/gpx/url", 0UL }, + { tt_urlname, 0, "/gpx/urlname", 0UL }, + { tt_keywords, 0, "/gpx/keywords", 0UL }, + + { tt_wpt, 0, "/gpx/wpt", 0UL }, + { tt_wpt_ele, 0, "/gpx/wpt/ele", 0UL }, + { tt_wpt_time, 0, "/gpx/wpt/time", 0UL }, + { tt_wpt_name, 0, "/gpx/wpt/name", 0UL }, + { tt_wpt_cmt, 0, "/gpx/wpt/cmt", 0UL }, + { tt_wpt_desc, 0, "/gpx/wpt/desc", 0UL }, + { tt_wpt_url, 0, "/gpx/wpt/url", 0UL }, + { tt_wpt_urlname, 0, "/gpx/wpt/urlname", 0UL }, + { tt_wpt_link, 0, "/gpx/wpt/link", 0UL }, /* GPX 1.1 */ + { tt_wpt_link_text, 0, "/gpx/wpt/link/text", 0UL }, /* GPX 1.1 */ + { tt_wpt_sym, 0, "/gpx/wpt/sym", 0UL }, + { tt_wpt_type, 1, "/gpx/wpt/type", 0UL }, + { tt_cache, 1, "/gpx/wpt/groundspeak:cache", 0UL }, + { tt_cache_name, 1, "/gpx/wpt/groundspeak:cache/groundspeak:name", 0UL }, + { tt_cache_container, 1, "/gpx/wpt/groundspeak:cache/groundspeak:container", 0UL }, + { tt_cache_type, 1, "/gpx/wpt/groundspeak:cache/groundspeak:type", 0UL }, + { tt_cache_difficulty, 1, "/gpx/wpt/groundspeak:cache/groundspeak:difficulty", 0UL }, + { tt_cache_terrain, 1, "/gpx/wpt/groundspeak:cache/groundspeak:terrain", 0UL }, + { tt_cache_hint, 1, "/gpx/wpt/groundspeak:cache/groundspeak:encoded_hints", 0UL }, + { tt_cache_desc_short, 1, "/gpx/wpt/groundspeak:cache/groundspeak:short_description", 0UL }, + { tt_cache_desc_long, 1, "/gpx/wpt/groundspeak:cache/groundspeak:long_description", 0UL }, + { tt_cache_log_wpt, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:log_wpt", 0UL }, + { tt_cache_log_type, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:type", 0UL }, + { tt_cache_log_date, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:date", 0UL }, + { tt_cache_placer, 1, "/gpx/wpt/groundspeak:cache/groundspeak:owner", 0UL }, + + { tt_rte, 0, "/gpx/rte", 0UL }, + { tt_rte_name, 0, "/gpx/rte/name", 0UL }, + { tt_rte_desc, 0, "/gpx/rte/desc", 0UL }, + { tt_rte_number, 0, "/gpx/rte/number", 0UL }, + { tt_rte_rtept, 0, "/gpx/rte/rtept", 0UL }, + { tt_rte_rtept_ele, 0, "/gpx/rte/rtept/ele", 0UL }, + { tt_rte_rtept_time, 0, "/gpx/rte/rtept/time", 0UL }, + { tt_rte_rtept_name, 0, "/gpx/rte/rtept/name", 0UL }, + { tt_rte_rtept_cmt, 0, "/gpx/rte/rtept/cmt", 0UL }, + { tt_rte_rtept_desc, 0, "/gpx/rte/rtept/desc", 0UL }, + { tt_rte_rtept_url, 0, "/gpx/rte/rtept/url", 0UL }, + { tt_rte_rtept_urlname, 0, "/gpx/rte/rtept/urlname", 0UL }, + { tt_rte_rtept_sym, 0, "/gpx/rte/rtept/sym", 0UL }, + + { tt_trk, 0, "/gpx/trk", 0UL }, + { tt_trk_name, 0, "/gpx/trk/name", 0UL }, + { tt_trk_desc, 0, "/gpx/trk/desc", 0UL }, + { tt_trk_trkseg, 0, "/gpx/trk/trkseg", 0UL }, + { tt_trk_number, 0, "/gpx/trk/number", 0UL }, + { tt_trk_trkseg_trkpt, 0, "/gpx/trk/trkseg/trkpt", 0UL }, + { tt_trk_trkseg_trkpt_ele, 0, "/gpx/trk/trkseg/trkpt/ele", 0UL }, + { tt_trk_trkseg_trkpt_time, 0, "/gpx/trk/trkseg/trkpt/time", 0UL }, + { tt_trk_trkseg_trkpt_name, 0, "/gpx/trk/trkseg/trkpt/name", 0UL }, + { tt_trk_trkseg_trkpt_cmt, 0, "/gpx/trk/trkseg/trkpt/cmt", 0UL }, + { tt_trk_trkseg_trkpt_desc, 0, "/gpx/trk/trkseg/trkpt/desc", 0UL }, + { tt_trk_trkseg_trkpt_url, 0, "/gpx/trk/trkseg/trkpt/url", 0UL }, + { tt_trk_trkseg_trkpt_urlname, 0, "/gpx/trk/trkseg/trkpt/urlname", 0UL }, + { tt_trk_trkseg_trkpt_sym, 0, "/gpx/trk/trkseg/trkpt/sym", 0UL }, + { tt_trk_trkseg_trkpt_course, 0, "/gpx/trk/trkseg/trkpt/course", 0UL }, + { tt_trk_trkseg_trkpt_speed, 0, "/gpx/trk/trkseg/trkpt/speed", 0UL }, /* Common to tracks, routes, and waypts */ - { tt_fix, 0, "/gpx/wpt/fix" }, - { tt_fix, 0, "/gpx/trk/trkseg/trkpt/fix" }, - { tt_fix, 0, "/gpx/rte/rtept/fix" }, - { tt_sat, 0, "/gpx/wpt/sat" }, - { tt_sat, 0, "/gpx/trk/trkseg/trkpt/sat" }, - { tt_sat, 0, "/gpx/rte/rtept/sat" }, - { tt_pdop, 0, "/gpx/wpt/pdop" }, - { tt_pdop, 0, "/gpx/trk/trkseg/trkpt/pdop" }, - { tt_pdop, 0, "/gpx/rte/rtept/pdop" }, - { tt_hdop, 0, "/gpx/wpt/hdop" }, - { tt_hdop, 0, "/gpx/trk/trkseg/trkpt/hdop" }, - { tt_hdop, 0, "/gpx/rte/rtept/hdop" }, - { tt_vdop, 0, "/gpx/wpt/vdop" }, - { tt_vdop, 0, "/gpx/trk/trkseg/trkpt/vdop" }, - { tt_vdop, 0, "/gpx/rte/rtept/hdop" }, - {0} + { tt_fix, 0, "/gpx/wpt/fix", 0UL }, + { tt_fix, 0, "/gpx/trk/trkseg/trkpt/fix", 0UL }, + { tt_fix, 0, "/gpx/rte/rtept/fix", 0UL }, + { tt_sat, 0, "/gpx/wpt/sat", 0UL }, + { tt_sat, 0, "/gpx/trk/trkseg/trkpt/sat", 0UL }, + { tt_sat, 0, "/gpx/rte/rtept/sat", 0UL }, + { tt_pdop, 0, "/gpx/wpt/pdop", 0UL }, + { tt_pdop, 0, "/gpx/trk/trkseg/trkpt/pdop", 0UL }, + { tt_pdop, 0, "/gpx/rte/rtept/pdop", 0UL }, + { tt_hdop, 0, "/gpx/wpt/hdop", 0UL }, + { tt_hdop, 0, "/gpx/trk/trkseg/trkpt/hdop", 0UL }, + { tt_hdop, 0, "/gpx/rte/rtept/hdop", 0UL }, + { tt_vdop, 0, "/gpx/wpt/vdop", 0UL }, + { tt_vdop, 0, "/gpx/trk/trkseg/trkpt/vdop", 0UL }, + { tt_vdop, 0, "/gpx/rte/rtept/hdop", 0UL }, + {0, 0, NULL, 0UL} }; static tag_type @@ -1700,15 +1700,15 @@ arglist_t gpx_args[] = { "32", ARGTYPE_INT, "1", NULL }, { "suppresswhite", &suppresswhite, "Suppress whitespace in generated shortnames", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, { "logpoint", &opt_logpoint, "Create waypoints from geocache log entries", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, { "urlbase", &urlbase, "Base URL for link tag in output", - NULL, ARGTYPE_STRING}, + NULL, ARGTYPE_STRING, ARG_NOMINMAX}, { "gpxver", &gpx_wversion, "Target GPX version for output", - "1.0", ARGTYPE_STRING}, - { 0, 0, 0, 0, 0 } + "1.0", ARGTYPE_STRING, ARG_NOMINMAX}, + ARG_TERMINATOR }; ff_vecs_t gpx_vecs = { diff --git a/gpsbabel/gtm.c b/gpsbabel/gtm.c index 459c5b863..350c9ee6e 100644 --- a/gpsbabel/gtm.c +++ b/gpsbabel/gtm.c @@ -750,7 +750,7 @@ gtm_write(void) static arglist_t gtm_args[] = { - { 0, 0, 0, 0, 0 } + ARG_TERMINATOR }; ff_vecs_t gtm_vecs = { diff --git a/gpsbabel/hiketech.c b/gpsbabel/hiketech.c index c8d5c01a2..d8e67c787 100644 --- a/gpsbabel/hiketech.c +++ b/gpsbabel/hiketech.c @@ -31,7 +31,7 @@ static route_head *trk_head; static arglist_t hiketech_args[] = { - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; /* Waypoints */ diff --git a/gpsbabel/hsa_ndv.c b/gpsbabel/hsa_ndv.c index 5b3a6811d..973e4538e 100644 --- a/gpsbabel/hsa_ndv.c +++ b/gpsbabel/hsa_ndv.c @@ -43,7 +43,7 @@ static FILE *ofd; static arglist_t hsa_ndv_args[] = { - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; #define MYNAME "HsaNdv" diff --git a/gpsbabel/html.c b/gpsbabel/html.c index 437642b07..b299a74d7 100644 --- a/gpsbabel/html.c +++ b/gpsbabel/html.c @@ -36,12 +36,12 @@ static char *includelogs = NULL; static arglist_t html_args[] = { { "stylesheet", &stylesheet, - "Path to HTML style sheet", NULL, ARGTYPE_STRING }, + "Path to HTML style sheet", NULL, ARGTYPE_STRING, ARG_NOMINMAX }, { "encrypt", &encrypt, - "Encrypt hints using ROT13", NULL, ARGTYPE_BOOL }, + "Encrypt hints using ROT13", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, { "logs", &includelogs, - "Include groundspeak logs if present", NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + "Include groundspeak logs if present", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; diff --git a/gpsbabel/igc.c b/gpsbabel/igc.c index 05b3877d8..0da923ac1 100644 --- a/gpsbabel/igc.c +++ b/gpsbabel/igc.c @@ -888,8 +888,8 @@ static void data_write(void) static arglist_t igc_args[] = { {"timeadj", &timeadj, "(integer sec or 'auto') Barograph to GPS time diff", - NULL, ARGTYPE_STRING}, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_STRING, ARG_NOMINMAX}, + ARG_TERMINATOR }; ff_vecs_t igc_vecs = { diff --git a/gpsbabel/ignrando.c b/gpsbabel/ignrando.c index ca03b96dd..a29ef2c5f 100644 --- a/gpsbabel/ignrando.c +++ b/gpsbabel/ignrando.c @@ -48,7 +48,7 @@ static char *index_opt = NULL; static arglist_t ignr_args[] = { {"index", &index_opt, "Index of track to write (if more the one in source)", NULL, ARGTYPE_INT, "1", NULL }, - {0, 0, 0, 0 } + ARG_TERMINATOR }; static xg_callback ignr_start; diff --git a/gpsbabel/jeeps/gpsusbsend.c b/gpsbabel/jeeps/gpsusbsend.c index 8e0877a45..798b5af3d 100644 --- a/gpsbabel/jeeps/gpsusbsend.c +++ b/gpsbabel/jeeps/gpsusbsend.c @@ -45,7 +45,8 @@ GPS_Make_Packet_usb(GPS_PPacket *packet, UC type, UC *data, int16 n) int32 GPS_Write_Packet_usb(int32 fd, GPS_PPacket packet) { - garmin_usb_packet gp = {0}; + garmin_usb_packet gp; + memset(&gp, 0, sizeof(gp)); /* diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c index 3f85a3d52..c8adbed3f 100644 --- a/gpsbabel/kml.c +++ b/gpsbabel/kml.c @@ -51,23 +51,23 @@ static point3d *point3d_list; static arglist_t kml_args[] = { - {"deficon", &opt_deficon, "Default icon name", NULL, ARGTYPE_STRING }, + {"deficon", &opt_deficon, "Default icon name", NULL, ARGTYPE_STRING, ARG_NOMINMAX }, {"lines", &opt_export_lines, "Export linestrings for tracks and routes", - "1", ARGTYPE_BOOL }, + "1", ARGTYPE_BOOL, ARG_NOMINMAX }, {"points", &opt_export_points, "Export placemarks for tracks and routes", - "1", ARGTYPE_BOOL }, + "1", ARGTYPE_BOOL, ARG_NOMINMAX }, {"line_width", &opt_line_width, "Width of lines, in pixels", - "6", ARGTYPE_INT }, + "6", ARGTYPE_INT, ARG_NOMINMAX }, {"line_color", &opt_line_color, "Line color, specified in hex AABBGGRR", - "64eeee17", ARGTYPE_STRING }, + "64eeee17", ARGTYPE_STRING, ARG_NOMINMAX }, {"floating", &opt_floating, "Altitudes are absolute and not clamped to ground", - "0", ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + "0", ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; #define MYNAME "kml" diff --git a/gpsbabel/lowranceusr.c b/gpsbabel/lowranceusr.c index 0e613772d..e6f758c58 100644 --- a/gpsbabel/lowranceusr.c +++ b/gpsbabel/lowranceusr.c @@ -183,7 +183,7 @@ static char *seg_break; #define UNKNOWN_USR_ALTITUDE -3048 /* -10000ft is how the unit stores unknown */ /* Jan 1, 2000 00:00:00 */ -struct tm base_time = { 0, 0, 0, 1, 0, 100, 5, 1, -1 }; +struct tm base_time = { 0, 0, 0, 1, 0, 100, 5, 1, -1, 0, 0 }; static size_t @@ -260,12 +260,12 @@ lowranceusr_fread(void *buff, size_t size, size_t members, FILE * fp) static arglist_t lowranceusr_args[] = { {"ignoreicons", &ignoreicons, "Ignore event marker icons", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"merge", &merge, "(USR output) Merge into one segmented track", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"break", &seg_break, "(USR input) Break segments into separate tracks", - NULL, ARGTYPE_BOOL }, - {NULL, NULL, NULL, NULL, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; static void diff --git a/gpsbabel/mag_pdb.c b/gpsbabel/mag_pdb.c index 5e8a8467a..986f9b0ac 100644 --- a/gpsbabel/mag_pdb.c +++ b/gpsbabel/mag_pdb.c @@ -40,7 +40,7 @@ static char *fname_in; static arglist_t magpdb_args[] = { - {0, 0, 0, 0, 0 } + ARG_TERMINATOR }; static double diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c index 74638159c..7f41cf6d3 100644 --- a/gpsbabel/magproto.c +++ b/gpsbabel/magproto.c @@ -717,23 +717,27 @@ termwrite(char *obuf, int size) static arglist_t mag_sargs[] = { {"baud", &bs, "Numeric value of bitrate (baud=4800)", NULL, - ARGTYPE_INT }, + ARGTYPE_INT, ARG_NOMINMAX }, {"maxcmts", &cmts, "Max number of comments to write (maxcmts=200)", - NULL, ARGTYPE_INT }, + NULL, ARGTYPE_INT, ARG_NOMINMAX }, {"noack", &noack, "Suppress use of handshaking in name of speed", - NULL, ARGTYPE_BOOL}, - {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING }, - {"nukewpt", &nukewpt, "Delete all waypoints", NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, + {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING, + ARG_NOMINMAX }, + {"nukewpt", &nukewpt, "Delete all waypoints", NULL, ARGTYPE_BOOL, + ARG_NOMINMAX }, + ARG_TERMINATOR }; static arglist_t mag_fargs[] = { - {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING }, + {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING, + ARG_NOMINMAX }, {"maxcmts", &cmts, "Max number of comments to write (maxcmts=200)", - NULL, ARGTYPE_INT }, - {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING }, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_INT, ARG_NOMINMAX }, + {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING, + ARG_NOMINMAX }, + ARG_TERMINATOR }; static void diff --git a/gpsbabel/mapsource.c b/gpsbabel/mapsource.c index 0e57d1be8..4fdf01b12 100644 --- a/gpsbabel/mapsource.c +++ b/gpsbabel/mapsource.c @@ -77,19 +77,19 @@ static arglist_t mps_args[] = { {"snlen", &snlen, "Length of generated shortnames", "10", ARGTYPE_INT, "1", NULL }, { "snwhite", &snwhiteopt, "Allow whitespace synth. shortnames", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {"mpsverout", &mpsverout, "Version of mapsource file to generate (3,4,5)", NULL, - ARGTYPE_INT }, + ARGTYPE_INT, ARG_NOMINMAX }, {"mpsmergeout", &mpsmergeouts, "Merge output with existing file", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"mpsusedepth", &mpsusedepth, "Use depth values on output (default is ignore)", NULL, - ARGTYPE_BOOL }, + ARGTYPE_BOOL, ARG_NOMINMAX }, {"mpsuseprox", &mpsuseprox, "Use proximity values on output (default is ignore)", - NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; /* diff --git a/gpsbabel/msroute.c b/gpsbabel/msroute.c index 4cb5f932b..f28d3b255 100644 --- a/gpsbabel/msroute.c +++ b/gpsbabel/msroute.c @@ -33,7 +33,7 @@ static char *fin_name; static arglist_t msroute_args[] = { - {0, 0, 0, 0, 0 } + ARG_TERMINATOR }; /* MS-AutoRoute structures */ diff --git a/gpsbabel/navicache.c b/gpsbabel/navicache.c index 74d8e0e4d..2608a9e27 100644 --- a/gpsbabel/navicache.c +++ b/gpsbabel/navicache.c @@ -33,8 +33,8 @@ static char *noretired = NULL; static arglist_t nav_args[] = { {"noretired", &noretired, "Suppress retired geocaches", - NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; #define MYNAME "navicache" diff --git a/gpsbabel/netstumbler.c b/gpsbabel/netstumbler.c index 241428558..c83424ab6 100644 --- a/gpsbabel/netstumbler.c +++ b/gpsbabel/netstumbler.c @@ -39,15 +39,16 @@ static void fix_netstumbler_dupes(void); static arglist_t netstumbler_args[] = { {"nseicon", &nseicon, "Non-stealth encrypted icon name", - "Red Square", ARGTYPE_STRING }, + "Red Square", ARGTYPE_STRING, ARG_NOMINMAX }, {"nsneicon", &nsneicon, "Non-stealth non-encrypted icon name", - "Green Square", ARGTYPE_STRING }, + "Green Square", ARGTYPE_STRING, ARG_NOMINMAX }, {"seicon", &seicon, "Stealth encrypted icon name", - "Red Diamond", ARGTYPE_STRING }, + "Red Diamond", ARGTYPE_STRING, ARG_NOMINMAX }, {"sneicon", &sneicon, "Stealth non-encrypted icon name", - "Green Diamond", ARGTYPE_STRING }, - {"snmac", &snmac, "Shortname is MAC address", NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + "Green Diamond", ARGTYPE_STRING, ARG_NOMINMAX }, + {"snmac", &snmac, "Shortname is MAC address", NULL, ARGTYPE_BOOL, + ARG_NOMINMAX }, + ARG_TERMINATOR }; static void @@ -76,7 +77,9 @@ data_read(void) int stealth_num = 0, whitespace_num = 0; long flags = 0; int speed = 0, channel = 0; - struct tm tm = {0}; + struct tm tm; + + memset(&tm, 0, sizeof(tm)); for(; fgets(ibuf, sizeof(ibuf), file_in);) { char *field; diff --git a/gpsbabel/nmea.c b/gpsbabel/nmea.c index 8eda30488..c892b1756 100644 --- a/gpsbabel/nmea.c +++ b/gpsbabel/nmea.c @@ -165,13 +165,13 @@ static char *snlenopt = NULL; static char *optdate = NULL; arglist_t nmea_args[] = { - {"gprmc", &dogprmc, "Write GPRMC sentences", NULL, ARGTYPE_BOOL }, + {"gprmc", &dogprmc, "Write GPRMC sentences", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"snlen", &snlenopt, "Max length of waypoint name to write", "6", ARGTYPE_INT, "1", "64" }, - {"nogpgga", &nogpgga, "Don't write GPGGA sentences", NULL, ARGTYPE_BOOL }, - {"nogpvtg", &nogpvtg, "Don't write GPVTG sentences", NULL, ARGTYPE_BOOL }, - {"nogpgsa", &nogpgsa, "Don't write GPGSA sentences", NULL, ARGTYPE_BOOL }, - {"date", &optdate, "Complete date-free tracks with given date (YYYYMMDD).", NULL, ARGTYPE_INT }, - {0, 0, 0, 0 } + {"nogpgga", &nogpgga, "Don't write GPGGA sentences", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + {"nogpvtg", &nogpvtg, "Don't write GPVTG sentences", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + {"nogpgsa", &nogpgsa, "Don't write GPGSA sentences", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + {"date", &optdate, "Complete date-free tracks with given date (YYYYMMDD).", NULL, ARGTYPE_INT, ARG_NOMINMAX }, + ARG_TERMINATOR }; /* diff --git a/gpsbabel/nmn4.c b/gpsbabel/nmn4.c index 9079533c9..2071e1a06 100644 --- a/gpsbabel/nmn4.c +++ b/gpsbabel/nmn4.c @@ -45,7 +45,7 @@ static char *index_opt; static arglist_t nmn4_args[] = { {"index", &index_opt, "Index of route to write (if more the one in source)", NULL, ARGTYPE_INT, "1", NULL }, - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; diff --git a/gpsbabel/nukedata.c b/gpsbabel/nukedata.c index 42004518b..ea3b3c83c 100644 --- a/gpsbabel/nukedata.c +++ b/gpsbabel/nukedata.c @@ -30,12 +30,12 @@ static char *nukewpts, *nuketrks, *nukertes; static arglist_t nuke_args[] = { {"waypoints", &nukewpts, "Remove all waypoints from data stream", - "0", ARGTYPE_BOOL} , + "0", ARGTYPE_BOOL, ARG_NOMINMAX} , {"tracks", &nuketrks, "Remove all tracks from data stream", - "0", ARGTYPE_BOOL} , + "0", ARGTYPE_BOOL, ARG_NOMINMAX} , {"routes", &nukertes, "Remove all routes from data stream", - "0", ARGTYPE_BOOL} , - {0, 0, 0, 0, 0} + "0", ARGTYPE_BOOL, ARG_NOMINMAX} , + ARG_TERMINATOR }; static void diff --git a/gpsbabel/overlay.c b/gpsbabel/overlay.c index 1c371a4e2..785919ae4 100644 --- a/gpsbabel/overlay.c +++ b/gpsbabel/overlay.c @@ -82,11 +82,11 @@ static arglist_t ovl_args[] = { { "size", &govl_size_s, "size index [101-] for routes", NULL, ARGTYPE_INT, "101", NULL }, { "mapname", &govl_mapname, "name of map", - NULL, ARGTYPE_STRING }, + NULL, ARGTYPE_STRING, ARG_NOMINMAX }, { "zoomfc", &govl_zoomfc_s, "zoom factor of map in %", - NULL, ARGTYPE_INT }, + NULL, ARGTYPE_INT, ARG_NOMINMAX }, { "dimmfc", &govl_dimmfc_s, "dimmer factor of map in %", - NULL, ARGTYPE_INT }, + NULL, ARGTYPE_INT, ARG_NOMINMAX }, { "txtcol", &govl_txtcol_s, "color index [1-9] for waypoint names", NULL, ARGTYPE_INT, "1", "9" }, { "txtsize", &govl_txtsize_s, "text size [101-] for waypoint names", @@ -94,10 +94,10 @@ static arglist_t ovl_args[] = { { "font", &govl_font_s, "font index [1-] for waypoint names", NULL, ARGTYPE_INT, "1", NULL }, { "txttrans", &govl_txttrans_s, "set text background to transparent", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, { "file", &govl_file_s, "use file of parameters (parameters on command line overwrites file parameters)", - NULL, ARGTYPE_STRING }, - { 0, 0, 0, 0, 0 } + NULL, ARGTYPE_STRING, ARG_NOMINMAX }, + ARG_TERMINATOR }; diff --git a/gpsbabel/ozi.c b/gpsbabel/ozi.c index 8b8543e12..7b6b8d8ce 100644 --- a/gpsbabel/ozi.c +++ b/gpsbabel/ozi.c @@ -61,16 +61,16 @@ arglist_t ozi_args[] = { {"snlen", &snlenopt, "Max synthesized shortname length", "32", ARGTYPE_INT, "1", NULL}, {"snwhite", &snwhiteopt, "Allow whitespace synth. shortnames", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {"snupper", &snupperopt, "UPPERCASE synth. shortnames", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {"snunique", &snuniqueopt, "Make synth. shortnames unique", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {"wptfgcolor", &wptfgcolor, "Waypoint foreground color", - "black", ARGTYPE_STRING}, + "black", ARGTYPE_STRING, ARG_NOMINMAX}, {"wptbgcolor", &wptbgcolor, "Waypoint background color", - "yellow", ARGTYPE_STRING}, - {0, 0, 0, 0, 0} + "yellow", ARGTYPE_STRING, ARG_NOMINMAX}, + ARG_TERMINATOR }; static gpsdata_type ozi_objective; diff --git a/gpsbabel/palmdoc.c b/gpsbabel/palmdoc.c index 4d731f06b..d36d4248a 100644 --- a/gpsbabel/palmdoc.c +++ b/gpsbabel/palmdoc.c @@ -68,15 +68,15 @@ static arglist_t palmdoc_args[] = { { "nosep", &suppresssep, "Suppress separator lines between waypoints", NULL, - ARGTYPE_BOOL }, - {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING }, + ARGTYPE_BOOL, ARG_NOMINMAX }, + {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING, ARG_NOMINMAX }, {"encrypt", &encrypt, "Encrypt hints with ROT13", NULL, - ARGTYPE_BOOL }, + ARGTYPE_BOOL, ARG_NOMINMAX }, { "logs", &includelogs, - "Include groundspeak logs if present", NULL, ARGTYPE_BOOL }, + "Include groundspeak logs if present", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, { "bookmarks_short", &bmid, "Include short name in bookmarks", - NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; static struct buffer buf; diff --git a/gpsbabel/pathaway.c b/gpsbabel/pathaway.c index 26b900665..c4e0cda20 100644 --- a/gpsbabel/pathaway.c +++ b/gpsbabel/pathaway.c @@ -63,10 +63,10 @@ static char *snlen_opt = NULL; static arglist_t ppdb_args[] = { - {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING}, - {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING}, + {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING, ARG_NOMINMAX}, + {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING, ARG_NOMINMAX}, {"snlen", &snlen_opt, "Length of generated shortnames", "10", ARGTYPE_INT, "1", NULL }, - {0, 0, 0, 0, 0 } + ARG_TERMINATOR }; #undef PPDB_DEBUG diff --git a/gpsbabel/pcx.c b/gpsbabel/pcx.c index 02615a782..0c5c34280 100644 --- a/gpsbabel/pcx.c +++ b/gpsbabel/pcx.c @@ -38,11 +38,11 @@ static int route_ctr; static arglist_t pcx_args[] = { {"deficon", &deficon, "Default icon name", "Waypoint", - ARGTYPE_STRING }, + ARGTYPE_STRING, ARG_NOMINMAX }, {"cartoexploreur", &cartoexploreur, "Write tracks compatible with Carto Exploreur", "", - ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; static void diff --git a/gpsbabel/polygon.c b/gpsbabel/polygon.c index de4609074..6a4a652d9 100644 --- a/gpsbabel/polygon.c +++ b/gpsbabel/polygon.c @@ -43,10 +43,10 @@ typedef struct { static arglist_t polygon_args[] = { {"file", &polyfileopt, "File containing vertices of polygon", - NULL, ARGTYPE_FILE | ARGTYPE_REQUIRED }, + NULL, ARGTYPE_FILE | ARGTYPE_REQUIRED, ARG_NOMINMAX }, {"exclude", &exclopt, "Exclude points inside the polygon", - NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; static void polytest ( double lat1, double lon1, diff --git a/gpsbabel/position.c b/gpsbabel/position.c index a47954ff7..9fe7c26c3 100644 --- a/gpsbabel/position.c +++ b/gpsbabel/position.c @@ -48,30 +48,30 @@ typedef struct { static arglist_t position_args[] = { {"distance", &distopt, "Maximum positional distance", - NULL, ARGTYPE_FLOAT | ARGTYPE_REQUIRED }, + NULL, ARGTYPE_FLOAT | ARGTYPE_REQUIRED, ARG_NOMINMAX }, {"all", &purge_duplicates, "Suppress all points close to other points", - NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; static arglist_t radius_args[] = { {"lat", &latopt, "Latitude for center point (D.DDDDD)", - NULL, ARGTYPE_FLOAT | ARGTYPE_REQUIRED }, + NULL, ARGTYPE_FLOAT | ARGTYPE_REQUIRED, ARG_NOMINMAX }, {"lon", &lonopt, "Longitude for center point (D.DDDDD)", - NULL, ARGTYPE_FLOAT | ARGTYPE_REQUIRED }, + NULL, ARGTYPE_FLOAT | ARGTYPE_REQUIRED, ARG_NOMINMAX }, {"distance", &distopt, "Maximum distance from center", - NULL, ARGTYPE_FLOAT | ARGTYPE_REQUIRED }, + NULL, ARGTYPE_FLOAT | ARGTYPE_REQUIRED, ARG_NOMINMAX }, {"exclude", &exclopt, "Exclude points close to center", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"nosort", &nosort, "Inhibit sort by distance to center", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"maxcount", &maxctarg,"Output no more than this number of points", NULL, ARGTYPE_INT, "1", NULL }, {"asroute", &routename,"Put resulting waypoints in route of this name", NULL, ARGTYPE_STRING, NULL, NULL }, - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; static double diff --git a/gpsbabel/psitrex.c b/gpsbabel/psitrex.c index bd0aa8b3c..c626b81c2 100755 --- a/gpsbabel/psitrex.c +++ b/gpsbabel/psitrex.c @@ -58,7 +58,7 @@ static arglist_t psit_args[] = { /* {"snlen", &snlen, "Length of generated shortnames", NULL, ARGTYPE_INT, "1", NULL }, */ - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; /* Taken from PsiTrex 1.13 */ diff --git a/gpsbabel/quovadis.c b/gpsbabel/quovadis.c index 58b7e3b90..51d7043c5 100644 --- a/gpsbabel/quovadis.c +++ b/gpsbabel/quovadis.c @@ -35,8 +35,8 @@ static char *dbname = NULL; static arglist_t quovadis_args[] = { - {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING}, - {0, 0, 0, 0, 0} + {"dbname", &dbname, "Database name", NULL, ARGTYPE_STRING, ARG_NOMINMAX}, + ARG_TERMINATOR }; static struct qv_icon_mapping mapping[] = { diff --git a/gpsbabel/reverse_route.c b/gpsbabel/reverse_route.c index 82b9848eb..6bc204f2e 100644 --- a/gpsbabel/reverse_route.c +++ b/gpsbabel/reverse_route.c @@ -25,7 +25,7 @@ static arglist_t reverse_route_args[] = { - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; void diff --git a/gpsbabel/saroute.c b/gpsbabel/saroute.c index a434ed05f..239b08a34 100644 --- a/gpsbabel/saroute.c +++ b/gpsbabel/saroute.c @@ -39,14 +39,14 @@ static arglist_t saroute_args[] = { {"turns_important", &turns_important, "Keep turns if simplify filter is used", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"turns_only", &turns_only, "Only read turns; skip all other points", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"split", &split, "Split into multiple routes at turns", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"controls", &controls, "Read control points as waypoint/route/none", - "none", ARGTYPE_STRING }, - {0, 0, 0, 0 } + "none", ARGTYPE_STRING, ARG_NOMINMAX }, + ARG_TERMINATOR }; unsigned short diff --git a/gpsbabel/shape.c b/gpsbabel/shape.c index 607f62ed5..c999cf014 100644 --- a/gpsbabel/shape.c +++ b/gpsbabel/shape.c @@ -40,7 +40,7 @@ static arglist_t shp_args[] = { {"name", &opt_name, "Index of name field in .dbf", NULL, ARGTYPE_INT, "0", NULL }, - { 0, 0, 0, 0} + ARG_TERMINATOR }; static void diff --git a/gpsbabel/smplrout.c b/gpsbabel/smplrout.c index bd23024f7..9bf0facfb 100644 --- a/gpsbabel/smplrout.c +++ b/gpsbabel/smplrout.c @@ -73,10 +73,10 @@ arglist_t routesimple_args[] = { {"error", &erroropt, "Maximum error", NULL, ARGTYPE_STRING | ARGTYPE_END_REQ | ARGTYPE_END_EXCL, "0", NULL}, {"crosstrack", &xteopt, "Use cross-track error (default)", NULL, - ARGTYPE_BOOL | ARGTYPE_BEGIN_EXCL, NULL, NULL }, + ARGTYPE_BOOL | ARGTYPE_BEGIN_EXCL, ARG_NOMINMAX }, {"length", &lenopt, "Use arclength error", NULL, - ARGTYPE_BOOL | ARGTYPE_END_EXCL, NULL, NULL }, - {0, 0, 0, 0, 0} + ARGTYPE_BOOL | ARGTYPE_END_EXCL, ARG_NOMINMAX }, + ARG_TERMINATOR }; struct xte_intermed; diff --git a/gpsbabel/sort.c b/gpsbabel/sort.c index 29c665929..790faa299 100644 --- a/gpsbabel/sort.c +++ b/gpsbabel/sort.c @@ -36,14 +36,14 @@ static char *opt_sm_gcid, *opt_sm_shortname, *opt_sm_description, *opt_sm_time; static arglist_t sort_args[] = { {"gcid", &opt_sm_gcid, "Sort by numeric geocache ID", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"shortname", &opt_sm_shortname, "Sort by waypoint short name", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"description", &opt_sm_description, "Sort by waypoint description", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"time", &opt_sm_time, "Sort by time", - NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; static int diff --git a/gpsbabel/stackfilter.c b/gpsbabel/stackfilter.c index 6f973292f..cc4779284 100644 --- a/gpsbabel/stackfilter.c +++ b/gpsbabel/stackfilter.c @@ -39,24 +39,24 @@ static int swapdepth = 0; static arglist_t stackfilt_args[] = { {"push", &opt_push, "Push waypoint list onto stack", NULL, - ARGTYPE_BEGIN_EXCL | ARGTYPE_BEGIN_REQ | ARGTYPE_BOOL}, + ARGTYPE_BEGIN_EXCL | ARGTYPE_BEGIN_REQ | ARGTYPE_BOOL, ARG_NOMINMAX}, {"pop", &opt_pop, "Pop waypoint list from stack", NULL, - ARGTYPE_BOOL}, + ARGTYPE_BOOL, ARG_NOMINMAX}, {"swap", &opt_swap, "Swap waypoint list with item on stack", - NULL, ARGTYPE_END_EXCL | ARGTYPE_END_REQ | ARGTYPE_BOOL}, + NULL, ARGTYPE_END_EXCL | ARGTYPE_END_REQ | ARGTYPE_BOOL, ARG_NOMINMAX}, {"copy", &opt_copy, "(push) Copy waypoint list", NULL, - ARGTYPE_BOOL}, + ARGTYPE_BOOL, ARG_NOMINMAX}, {"append", &opt_append, "(pop) Append list", NULL, - ARGTYPE_BEGIN_EXCL | ARGTYPE_BOOL}, + ARGTYPE_BEGIN_EXCL | ARGTYPE_BOOL, ARG_NOMINMAX}, {"discard", &opt_discard, "(pop) Discard top of stack", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {"replace", &opt_replace, "(pop) Replace list (default)", - NULL, ARGTYPE_END_EXCL | ARGTYPE_BOOL}, + NULL, ARGTYPE_END_EXCL | ARGTYPE_BOOL, ARG_NOMINMAX}, {"depth", &opt_depth, "(swap) Item to use (default=1)", NULL, ARGTYPE_INT, "0", NULL}, {"nowarn", &nowarn, "Suppress cleanup warning", NULL, - ARGTYPE_BOOL | ARGTYPE_HIDDEN}, - {0, 0, 0, 0, 0} + ARGTYPE_BOOL | ARGTYPE_HIDDEN, ARG_NOMINMAX}, + ARG_TERMINATOR }; struct stack_elt { diff --git a/gpsbabel/stmwpp.c b/gpsbabel/stmwpp.c index e3a64e6c4..e927f7acb 100644 --- a/gpsbabel/stmwpp.c +++ b/gpsbabel/stmwpp.c @@ -48,7 +48,7 @@ arglist_t stmwpp_args[] = { {"index", &index_opt, "Index of route/track to write (if more the one in source)", NULL, ARGTYPE_INT, "1", NULL }, - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; diff --git a/gpsbabel/tef_xml.c b/gpsbabel/tef_xml.c index 8cdd55f3d..bcfa4054c 100644 --- a/gpsbabel/tef_xml.c +++ b/gpsbabel/tef_xml.c @@ -36,8 +36,8 @@ static char *routevia = NULL; static arglist_t tef_xml_args[] = { - {"routevia", &routevia, "Include only via stations in route", NULL, ARGTYPE_BOOL}, - {0, 0, 0, 0 } + {"routevia", &routevia, "Include only via stations in route", NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, + ARG_TERMINATOR }; #define MYNAME "TourExchangeFormat" diff --git a/gpsbabel/text.c b/gpsbabel/text.c index afd4ec68a..70297d514 100644 --- a/gpsbabel/text.c +++ b/gpsbabel/text.c @@ -37,12 +37,12 @@ static arglist_t text_args[] = { { "nosep", &suppresssep, "Suppress separator lines between waypoints", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, { "encrypt", &encrypt, - "Encrypt hints using ROT13", NULL, ARGTYPE_BOOL }, + "Encrypt hints using ROT13", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, { "logs", &includelogs, - "Include groundspeak logs if present", NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + "Include groundspeak logs if present", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; diff --git a/gpsbabel/tiger.c b/gpsbabel/tiger.c index 9348d19ac..fb3575422 100644 --- a/gpsbabel/tiger.c +++ b/gpsbabel/tiger.c @@ -63,37 +63,37 @@ static char *clickmap = NULL; static arglist_t tiger_args[] = { {"nolabels", &nolabels, "Suppress labels on generated pins", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"genurl", &genurl, "Generate file with lat/lon for centering map", - NULL, ARGTYPE_OUTFILE }, + NULL, ARGTYPE_OUTFILE, ARG_NOMINMAX }, {"margin", &margin, "Margin for map. Degrees or percentage", - "15%", ARGTYPE_FLOAT}, + "15%", ARGTYPE_FLOAT, ARG_NOMINMAX}, {"snlen", &snlen, "Max shortname length when used with -s", "10", ARGTYPE_INT, "1", NULL}, {"oldthresh", &oldthresh, "Days after which points are considered old", - "14", ARGTYPE_INT}, + "14", ARGTYPE_INT, ARG_NOMINMAX}, {"oldmarker", &oldmarker, "Marker type for old points", - "redpin", ARGTYPE_STRING}, + "redpin", ARGTYPE_STRING, ARG_NOMINMAX}, {"newmarker", &newmarker, "Marker type for new points", - "greenpin", ARGTYPE_STRING}, + "greenpin", ARGTYPE_STRING, ARG_NOMINMAX}, {"suppresswhite", &suppresswhite, "Suppress whitespace in generated shortnames", - NULL, ARGTYPE_BOOL }, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, {"unfoundmarker", &unfoundmarker, "Marker type for unfound points", - "bluepin", ARGTYPE_STRING}, + "bluepin", ARGTYPE_STRING, ARG_NOMINMAX}, {"xpixels", &xpixels, "Width in pixels of map", - "768", ARGTYPE_INT}, + "768", ARGTYPE_INT, ARG_NOMINMAX}, {"ypixels", &ypixels, "Height in pixels of map", - "768", ARGTYPE_INT}, + "768", ARGTYPE_INT, ARG_NOMINMAX}, {"iconismarker", &iconismarker, "The icon description is already the marker", NULL, - ARGTYPE_BOOL }, + ARGTYPE_BOOL, ARG_NOMINMAX }, #if CLICKMAP {"clickmap", &clickmap, "Generate Clickable map web page", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, #endif - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; diff --git a/gpsbabel/tomtom.c b/gpsbabel/tomtom.c index c81295676..97dcb81f0 100644 --- a/gpsbabel/tomtom.c +++ b/gpsbabel/tomtom.c @@ -41,7 +41,7 @@ static FILE *file_out; static arglist_t tomtom_args[] = { - {0, 0, 0, 0 } + ARG_TERMINATOR }; static void diff --git a/gpsbabel/tpg.c b/gpsbabel/tpg.c index fd7b2c906..442f9a3f4 100644 --- a/gpsbabel/tpg.c +++ b/gpsbabel/tpg.c @@ -40,8 +40,8 @@ static unsigned int waypt_out_count; static arglist_t tpg_args[] = { - {"datum", &tpg_datum_opt, "Datum (default=NAD27)", "N. America 1927 mean", ARGTYPE_STRING }, - {0, 0, 0, 0, 0} + {"datum", &tpg_datum_opt, "Datum (default=NAD27)", "N. America 1927 mean", ARGTYPE_STRING, ARG_NOMINMAX }, + ARG_TERMINATOR }; static int diff --git a/gpsbabel/tpo.c b/gpsbabel/tpo.c index 3fbb4cd20..6e47b504a 100644 --- a/gpsbabel/tpo.c +++ b/gpsbabel/tpo.c @@ -41,10 +41,10 @@ static char *output_state = NULL; static arglist_t tpo_args[] = { { "dumpheader", &dumpheader, "Display the file header bytes", - "0", ARGTYPE_BOOL} , + "0", ARGTYPE_BOOL, ARG_NOMINMAX} , { "state", &output_state, "State map format to write, default=CA", - "CA", ARGTYPE_STRING} , - {0, 0, 0, 0, 0} + "CA", ARGTYPE_STRING, ARG_NOMINMAX} , + ARG_TERMINATOR }; static FILE *tpo_file_in; diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.c index 7a5a892af..2e2cacc6e 100644 --- a/gpsbabel/trackfilter.c +++ b/gpsbabel/trackfilter.c @@ -59,20 +59,20 @@ static char *opt_stop = NULL; static arglist_t trackfilter_args[] = { {TRACKFILTER_MOVE_OPTION, &opt_move, - "Correct trackpoint timestamps by a delta", NULL, ARGTYPE_STRING}, + "Correct trackpoint timestamps by a delta", NULL, ARGTYPE_STRING, ARG_NOMINMAX}, {TRACKFILTER_PACK_OPTION, &opt_pack, - "Pack all tracks into one", NULL, ARGTYPE_BOOL}, + "Pack all tracks into one", NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {TRACKFILTER_SPLIT_OPTION, &opt_split, - "Split track by date or by time interval (see README)", NULL, ARGTYPE_STRING}, + "Split track by date or by time interval (see README)", NULL, ARGTYPE_STRING, ARG_NOMINMAX}, {TRACKFILTER_MERGE_OPTION, &opt_merge, - "Merge multiple tracks for the same way", NULL, ARGTYPE_STRING}, + "Merge multiple tracks for the same way", NULL, ARGTYPE_STRING, ARG_NOMINMAX}, {TRACKFILTER_START_OPTION, &opt_start, - "Use only track points after this timestamp", NULL, ARGTYPE_INT}, + "Use only track points after this timestamp", NULL, ARGTYPE_INT, ARG_NOMINMAX}, {TRACKFILTER_STOP_OPTION, &opt_stop, - "Use only track points before this timestamp", NULL, ARGTYPE_INT}, + "Use only track points before this timestamp", NULL, ARGTYPE_INT, ARG_NOMINMAX}, {TRACKFILTER_TITLE_OPTION, &opt_title, - "Basic title for new track(s)", NULL, ARGTYPE_STRING}, - {0, 0, 0, 0, 0} + "Basic title for new track(s)", NULL, ARGTYPE_STRING, ARG_NOMINMAX}, + ARG_TERMINATOR }; diff --git a/gpsbabel/unicsv.c b/gpsbabel/unicsv.c index d72a844b2..26bbd0b17 100644 --- a/gpsbabel/unicsv.c +++ b/gpsbabel/unicsv.c @@ -44,7 +44,7 @@ static char *unicsv_fieldsep; static arglist_t unicsv_args[] = { - {0, 0, 0, 0, 0} + ARG_TERMINATOR }; /* helpers */ diff --git a/gpsbabel/vcf.c b/gpsbabel/vcf.c index 51eb773d0..14a75d4a4 100644 --- a/gpsbabel/vcf.c +++ b/gpsbabel/vcf.c @@ -33,8 +33,8 @@ static char *encrypt = NULL; static arglist_t vcf_args[] = { { "encrypt", &encrypt, - "Encrypt hints using ROT13", NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + "Encrypt hints using ROT13", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; static void diff --git a/gpsbabel/vitosmt.c b/gpsbabel/vitosmt.c index 18fe4c2a6..e3de4500e 100644 --- a/gpsbabel/vitosmt.c +++ b/gpsbabel/vitosmt.c @@ -108,7 +108,7 @@ vitosmt_read(void) double lonrad =0; double elev =0; unsigned char* timestamp =0; - struct tm tmStruct ={0,0,0,0,0,0,0,0,0}; + struct tm tmStruct; double seconds =0.0; double speed =0.0; double course =0.0; @@ -118,7 +118,8 @@ vitosmt_read(void) unsigned char gpssats =0; int serial =0; - + + memset(&tmStruct, 0, sizeof(tmStruct)); /* * 24 bytes header */ diff --git a/gpsbabel/xcsv.c b/gpsbabel/xcsv.c index 5f45170cb..321299eac 100644 --- a/gpsbabel/xcsv.c +++ b/gpsbabel/xcsv.c @@ -43,21 +43,21 @@ static const char *intstylebuf = NULL; static arglist_t xcsv_args[] = { {"style", &styleopt, "Full path to XCSV style file", NULL, - ARGTYPE_FILE | ARGTYPE_REQUIRED }, + ARGTYPE_FILE | ARGTYPE_REQUIRED, ARG_NOMINMAX }, {"snlen", &snlenopt, "Max synthesized shortname length", NULL, ARGTYPE_INT, "1", NULL}, {"snwhite", &snwhiteopt, "Allow whitespace synth. shortnames", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {"snupper", &snupperopt, "UPPERCASE synth. shortnames", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {"snunique", &snuniqueopt, "Make synth. shortnames unique", - NULL, ARGTYPE_BOOL}, + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {"urlbase", &xcsv_urlbase, "Basename prepended to URL on output", - NULL, ARGTYPE_STRING}, + NULL, ARGTYPE_STRING, ARG_NOMINMAX}, {"prefer_shortnames", &prefer_shortnames, "Use shortname instead of description", - NULL, ARGTYPE_BOOL }, - {0, 0, 0, 0, 0} + NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, + ARG_TERMINATOR }; /* a table of config file constants mapped to chars */ diff --git a/gpsbabel/yahoo.c b/gpsbabel/yahoo.c index 015f2572c..367f5c00d 100644 --- a/gpsbabel/yahoo.c +++ b/gpsbabel/yahoo.c @@ -31,8 +31,8 @@ static arglist_t yahoo_args[] = { {"addrsep", &as, "String to separate concatenated address fields (default=\", \")", - ", ", ARGTYPE_STRING }, - {0, 0, 0, 0, 0} + ", ", ARGTYPE_STRING, ARG_NOMINMAX }, + ARG_TERMINATOR }; static xg_callback wpt_s, wpt_lat, wpt_lon, wpt_e; -- 2.30.2